82003bc6c31a5d89b0c29f38bc92c98b60b63ae2,refactoring/impl/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java,AutomaticVariableRenamer,nameToCanonicalName,#String#PsiNamedElement#,63

Before Change


  public String nameToCanonicalName(String name, PsiNamedElement psiVariable) {
    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(psiVariable.getManager());
    final String propertyName = codeStyleManager.variableNameToPropertyName(name, codeStyleManager.getVariableKind((PsiVariable)psiVariable));
    if (myToUnpluralize.contains(psiVariable)) return StringUtil.unpluralize(propertyName);
    return propertyName;
  }

After Change


    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(psiVariable.getManager());
    final String propertyName = codeStyleManager.variableNameToPropertyName(name, codeStyleManager.getVariableKind((PsiVariable)psiVariable));
    if (myToUnpluralize.contains(psiVariable)) {
      final String singular = StringUtil.unpluralize(propertyName);
      if (singular != null) return singular;
    }
    return propertyName;